From a9c4f880e3b724f7afeeab0337a833a345a5cc6b Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli>
Date: Wed, 3 May 2006 19:53:38 +0000
Subject: [PATCH] Remove 'CR/LF'-sses and similary token from alias names (CET
 dosn't handle line-breaks).

---
 cet/ansi_x3_4_1968.h | 6 +++---
 cet/cp1250.h         | 2 +-
 cet/cp1251.h         | 2 +-
 cet/cp1252.h         | 2 +-
 cet/cp1253.h         | 2 +-
 cet/cp1254.h         | 2 +-
 cet/cp1255.h         | 2 +-
 cet/cp1256.h         | 2 +-
 cet/cp1257.h         | 2 +-
 cet/ibm037.h         | 2 +-
 cet/ibm1004.h        | 2 +-
 cet/ibm1026.h        | 2 +-
 cet/ibm1047.h        | 2 +-
 cet/ibm256.h         | 2 +-
 cet/ibm273.h         | 2 +-
 cet/ibm277.h         | 2 +-
 cet/ibm278.h         | 2 +-
 cet/ibm280.h         | 2 +-
 cet/ibm284.h         | 2 +-
 cet/ibm285.h         | 2 +-
 cet/ibm297.h         | 2 +-
 cet/ibm437.h         | 2 +-
 cet/ibm500.h         | 2 +-
 cet/ibm850.h         | 2 +-
 cet/ibm851.h         | 2 +-
 cet/ibm852.h         | 2 +-
 cet/ibm855.h         | 2 +-
 cet/ibm857.h         | 2 +-
 cet/ibm860.h         | 2 +-
 cet/ibm861.h         | 2 +-
 cet/ibm862.h         | 2 +-
 cet/ibm863.h         | 2 +-
 cet/ibm864.h         | 2 +-
 cet/ibm865.h         | 2 +-
 cet/ibm868.h         | 2 +-
 cet/ibm869.h         | 2 +-
 cet/ibm871.h         | 2 +-
 cet/ibm891.h         | 2 +-
 cet/ibm903.h         | 2 +-
 cet/ibm904.h         | 2 +-
 cet/iso_8859_1.h     | 4 ++--
 cet/iso_8859_10.h    | 4 ++--
 cet/iso_8859_13.h    | 4 ++--
 cet/iso_8859_14.h    | 2 +-
 cet/iso_8859_15.h    | 2 +-
 cet/iso_8859_2.h     | 6 +++---
 cet/iso_8859_3.h     | 2 +-
 cet/iso_8859_4.h     | 2 +-
 cet/iso_8859_9.h     | 2 +-
 cet/macintosh.h      | 2 +-
 cet/macintosh_ce.h   | 2 +-
 51 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/cet/ansi_x3_4_1968.h b/cet/ansi_x3_4_1968.h
index 690ae515a..7136bb94b 100644
--- a/cet/ansi_x3_4_1968.h
+++ b/cet/ansi_x3_4_1968.h
@@ -28,10 +28,10 @@
 
 const char *cet_cs_alias_ansi_x3_4_1968[] = 
 {
-	"ANSI_X3.4-1968", "367/CR-LF", "ANSI_X3.4-1986", "ASCII", 
-	"CP367/CR-LF", "csASCII", "IBM367/CR-LF", "ISO646-US", 
+	"ANSI_X3.4-1968", "367", "ANSI_X3.4-1986", "ASCII", 
+	"CP367", "csASCII", "IBM367", "ISO646-US", 
 	"ISO646.1991-IRV", "iso-ir-6", "ISO_646.irv:1991", "us", 
-	"US-ASCII", NULL
+	NULL
 };
 
 #define cet_ucs4_ofs_ansi_x3_4_1968 128
diff --git a/cet/cp1250.h b/cet/cp1250.h
index 6440aa28d..c16ba4d01 100644
--- a/cet/cp1250.h
+++ b/cet/cp1250.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1250[] = 
 {
-	"CP1250/CR-LF", "1250/CR-LF", "ms-ee", "windows-1250", "WIN-CP1250",
+	"CP1250", "1250", "ms-ee", "windows-1250", "WIN-CP1250",
 	NULL
 };
 
diff --git a/cet/cp1251.h b/cet/cp1251.h
index 7c4b494af..efa2195c3 100644
--- a/cet/cp1251.h
+++ b/cet/cp1251.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1251[] = 
 {
-	"CP1251/CR-LF", "1251/CR-LF", "ms-cyrl", "windows-1251", "WIN-CP1251",
+	"CP1251", "1251", "ms-cyrl", "windows-1251", "WIN-CP1251",
 	NULL
 };
 
diff --git a/cet/cp1252.h b/cet/cp1252.h
index bf5ca0d50..01f202325 100644
--- a/cet/cp1252.h
+++ b/cet/cp1252.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1252[] = 
 {
-	"CP1252/CR-LF", "1252/CR-LF", "ms-ansi", "windows-1252", "WIN-CP1252",
+	"CP1252", "1252", "ms-ansi", "windows-1252", "WIN-CP1252",
 	NULL
 };
 
diff --git a/cet/cp1253.h b/cet/cp1253.h
index a62caf745..727139847 100644
--- a/cet/cp1253.h
+++ b/cet/cp1253.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1253[] = 
 {
-	"CP1253/CR-LF", "1253/CR-LF", "ms-greek", "windows-1253", "WIN-CP1253",
+	"CP1253", "1253", "ms-greek", "windows-1253", "WIN-CP1253",
 	NULL
 };
 
diff --git a/cet/cp1254.h b/cet/cp1254.h
index 3995e0942..55b75b6db 100644
--- a/cet/cp1254.h
+++ b/cet/cp1254.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1254[] = 
 {
-	"CP1254/CR-LF", "1254/CR-LF", "ms-turk", "windows-1254", "WIN-CP1254",
+	"CP1254", "1254", "ms-turk", "windows-1254", "WIN-CP1254",
 	NULL
 };
 
diff --git a/cet/cp1255.h b/cet/cp1255.h
index 155417437..d80498da3 100644
--- a/cet/cp1255.h
+++ b/cet/cp1255.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1255[] = 
 {
-	"CP1255/CR-LF", "1255/CR-LF", "ms-hebr", "windows-1255", "WIN-CP1255",
+	"CP1255", "1255", "ms-hebr", "windows-1255", "WIN-CP1255",
 	NULL
 };
 
diff --git a/cet/cp1256.h b/cet/cp1256.h
index 52a554e99..b4d8941c5 100644
--- a/cet/cp1256.h
+++ b/cet/cp1256.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1256[] = 
 {
-	"CP1256/CR-LF", "1256/CR-LF", "ms-arab", "windows-1256", "WIN-CP1256",
+	"CP1256", "1256", "ms-arab", "windows-1256", "WIN-CP1256",
 	NULL
 };
 
diff --git a/cet/cp1257.h b/cet/cp1257.h
index 070321ab2..3e9355fd1 100644
--- a/cet/cp1257.h
+++ b/cet/cp1257.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1257[] = 
 {
-	"CP1257/CR-LF", "1257/CR-LF", "WinBaltRim", "windows-1257", "WIN-CP1257",
+	"CP1257", "1257", "WinBaltRim", "windows-1257", "WIN-CP1257",
 	NULL
 };
 
diff --git a/cet/ibm037.h b/cet/ibm037.h
index 67488a733..3e4913720 100644
--- a/cet/ibm037.h
+++ b/cet/ibm037.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm037[] = 
 {
-	"IBM037/CR-LF", "037/CR-LF", "CP037/CR-LF", "ebcdic-cp-ca", 
+	"IBM037", "037", "CP037", "ebcdic-cp-ca", 
 	"ebcdic-cp-nl", "ebcdic-cp-us", "ebcdic-cp-wt", NULL
 };
 
diff --git a/cet/ibm1004.h b/cet/ibm1004.h
index d05fe37d8..152dcd9d0 100644
--- a/cet/ibm1004.h
+++ b/cet/ibm1004.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm1004[] = 
 {
-	"IBM1004/CR-LF", "1004/CR-LF", "CP1004/CR-LF", "os2latin1",
+	"IBM1004", "1004", "CP1004", "os2latin1",
 	NULL
 };
 
diff --git a/cet/ibm1026.h b/cet/ibm1026.h
index 8b528c365..18b86c1aa 100644
--- a/cet/ibm1026.h
+++ b/cet/ibm1026.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm1026[] = 
 {
-	"IBM1026/CR-LF", "1026/CR-LF", "CP1026/CR-LF", NULL
+	"IBM1026", "1026", "CP1026", NULL
 };
 
 #define cet_ucs4_ofs_ibm1026 4
diff --git a/cet/ibm1047.h b/cet/ibm1047.h
index 21447e1fb..873d11d3c 100644
--- a/cet/ibm1047.h
+++ b/cet/ibm1047.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm1047[] = 
 {
-	"IBM1047/CR-LF", "1047/CR-LF", "CP1047/CR-LF", NULL
+	"IBM1047", "1047", "CP1047", NULL
 };
 
 #define cet_ucs4_ofs_ibm1047 4
diff --git a/cet/ibm256.h b/cet/ibm256.h
index dc7a683c2..8603ab569 100644
--- a/cet/ibm256.h
+++ b/cet/ibm256.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm256[] = 
 {
-	"IBM256/CR-LF", "256/CR-LF", "CP256/CR-LF", "EBCDIC-INT1",
+	"IBM256", "256", "CP256", "EBCDIC-INT1",
 	NULL
 };
 
diff --git a/cet/ibm273.h b/cet/ibm273.h
index 83794b1e8..63fd4ddd8 100644
--- a/cet/ibm273.h
+++ b/cet/ibm273.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm273[] = 
 {
-	"IBM273/CR-LF", "273/CR-LF", "CP273/CR-LF", NULL
+	"IBM273", "273", "CP273", NULL
 };
 
 #define cet_ucs4_ofs_ibm273 4
diff --git a/cet/ibm277.h b/cet/ibm277.h
index cd6f21d1a..c1356e86f 100644
--- a/cet/ibm277.h
+++ b/cet/ibm277.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm277[] = 
 {
-	"IBM277/CR-LF", "EBCDIC-CP-DK", "EBCDIC-CP-NO", NULL
+	"IBM277", "EBCDIC-CP-DK", "EBCDIC-CP-NO", NULL
 };
 
 #define cet_ucs4_ofs_ibm277 4
diff --git a/cet/ibm278.h b/cet/ibm278.h
index c42b9086f..c89719db6 100644
--- a/cet/ibm278.h
+++ b/cet/ibm278.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm278[] = 
 {
-	"IBM278/CR-LF", "278/CR-LF", "CP278/CR-LF", "ebcdic-cp-fi", 
+	"IBM278", "278", "CP278", "ebcdic-cp-fi", 
 	"ebcdic-cp-se", NULL
 };
 
diff --git a/cet/ibm280.h b/cet/ibm280.h
index d996ae182..da3e7e30d 100644
--- a/cet/ibm280.h
+++ b/cet/ibm280.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm280[] = 
 {
-	"IBM280/CR-LF", "280/CR-LF", "CP280/CR-LF", "ebcdic-cp-it",
+	"IBM280", "280", "CP280", "ebcdic-cp-it",
 	NULL
 };
 
diff --git a/cet/ibm284.h b/cet/ibm284.h
index e3ba3f519..84e61712f 100644
--- a/cet/ibm284.h
+++ b/cet/ibm284.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm284[] = 
 {
-	"IBM284/CR-LF", "284/CR-LF", "CP284/CR-LF", "ebcdic-cp-es",
+	"IBM284", "284", "CP284", "ebcdic-cp-es",
 	NULL
 };
 
diff --git a/cet/ibm285.h b/cet/ibm285.h
index 3c63f684a..9fbdd32bb 100644
--- a/cet/ibm285.h
+++ b/cet/ibm285.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm285[] = 
 {
-	"IBM285/CR-LF", "285/CR-LF", "CP285/CR-LF", "ebcdic-cp-gb",
+	"IBM285", "285", "CP285", "ebcdic-cp-gb",
 	NULL
 };
 
diff --git a/cet/ibm297.h b/cet/ibm297.h
index db48e9a5c..9b327eee5 100644
--- a/cet/ibm297.h
+++ b/cet/ibm297.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm297[] = 
 {
-	"IBM297/CR-LF", "297/CR-LF", "CP297/CR-LF", "ebcdic-cp-fr",
+	"IBM297", "297", "CP297", "ebcdic-cp-fr",
 	NULL
 };
 
diff --git a/cet/ibm437.h b/cet/ibm437.h
index 173828cca..7c0520ea8 100644
--- a/cet/ibm437.h
+++ b/cet/ibm437.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm437[] = 
 {
-	"IBM437/CR-LF", "437/CR-LF", "CP437/CR-LF", NULL
+	"IBM437", "437", "CP437", NULL
 };
 
 #define cet_ucs4_ofs_ibm437 128
diff --git a/cet/ibm500.h b/cet/ibm500.h
index d023dd89f..8d64499a0 100644
--- a/cet/ibm500.h
+++ b/cet/ibm500.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm500[] = 
 {
-	"IBM500/CR-LF", "500/CR-LF", "500V1", "CP500/CR-LF", 
+	"IBM500", "500", "500V1", "CP500", 
 	"ebcdic-cp-be", "ebcdic-cp-ch", NULL
 };
 
diff --git a/cet/ibm850.h b/cet/ibm850.h
index 30a039be9..cb4e04ad5 100644
--- a/cet/ibm850.h
+++ b/cet/ibm850.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm850[] = 
 {
-	"IBM850/CR-LF", "850/CR-LF", "CP850/CR-LF", "csPC850Multilingual",
+	"IBM850", "850", "CP850", "csPC850Multilingual",
 	NULL
 };
 
diff --git a/cet/ibm851.h b/cet/ibm851.h
index ad35b9f73..95bab532c 100644
--- a/cet/ibm851.h
+++ b/cet/ibm851.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm851[] = 
 {
-	"IBM851/CR-LF", "851/CR-LF", "CP851/CR-LF", NULL
+	"IBM851", "851", "CP851", NULL
 };
 
 #define cet_ucs4_ofs_ibm851 128
diff --git a/cet/ibm852.h b/cet/ibm852.h
index 019994dad..8332c19c3 100644
--- a/cet/ibm852.h
+++ b/cet/ibm852.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm852[] = 
 {
-	"IBM852/CR-LF", "852/CR-LF", "CP852/CR-LF", "pcl2", 
+	"IBM852", "852", "CP852", "pcl2", 
 	"pclatin2", NULL
 };
 
diff --git a/cet/ibm855.h b/cet/ibm855.h
index ad38eeda4..4ed6603e8 100644
--- a/cet/ibm855.h
+++ b/cet/ibm855.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm855[] = 
 {
-	"IBM855/CR-LF", "855/CR-LF", "CP855/CR-LF", NULL
+	"IBM855", "855", "CP855", NULL
 };
 
 #define cet_ucs4_ofs_ibm855 128
diff --git a/cet/ibm857.h b/cet/ibm857.h
index 8f61a888c..4b26cdb28 100644
--- a/cet/ibm857.h
+++ b/cet/ibm857.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm857[] = 
 {
-	"IBM857/CR-LF", "857/CR-LF", "CP857/CR-LF", NULL
+	"IBM857", "857", "CP857", NULL
 };
 
 #define cet_ucs4_ofs_ibm857 128
diff --git a/cet/ibm860.h b/cet/ibm860.h
index 12df8608b..c2d2ced62 100644
--- a/cet/ibm860.h
+++ b/cet/ibm860.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm860[] = 
 {
-	"IBM860/CR-LF", "860/CR-LF", "CP860/CR-LF", NULL
+	"IBM860", "860", "CP860", NULL
 };
 
 #define cet_ucs4_ofs_ibm860 128
diff --git a/cet/ibm861.h b/cet/ibm861.h
index edd8e250f..cd8520f4e 100644
--- a/cet/ibm861.h
+++ b/cet/ibm861.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm861[] = 
 {
-	"IBM861/CR-LF", "861/CR-LF", "CP861/CR-LF", "cp-is",
+	"IBM861", "861", "CP861", "cp-is",
 	NULL
 };
 
diff --git a/cet/ibm862.h b/cet/ibm862.h
index 611fbbf7e..f7a559f65 100644
--- a/cet/ibm862.h
+++ b/cet/ibm862.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm862[] = 
 {
-	"IBM862/CR-LF", "862/CR-LF", "CP862/CR-LF", NULL
+	"IBM862", "862", "CP862", NULL
 };
 
 #define cet_ucs4_ofs_ibm862 128
diff --git a/cet/ibm863.h b/cet/ibm863.h
index 682f01d85..97909f6db 100644
--- a/cet/ibm863.h
+++ b/cet/ibm863.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm863[] = 
 {
-	"IBM863/CR-LF", "863/CR-LF", "CP863/CR-LF", NULL
+	"IBM863", "863", "CP863", NULL
 };
 
 #define cet_ucs4_ofs_ibm863 128
diff --git a/cet/ibm864.h b/cet/ibm864.h
index 4ec9234da..5dfac836f 100644
--- a/cet/ibm864.h
+++ b/cet/ibm864.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm864[] = 
 {
-	"IBM864/CR-LF", "864/CR-LF", "CP864/CR-LF", NULL
+	"IBM864", "864", "CP864", NULL
 };
 
 #define cet_ucs4_ofs_ibm864 128
diff --git a/cet/ibm865.h b/cet/ibm865.h
index c78f8a12b..2cde68dd8 100644
--- a/cet/ibm865.h
+++ b/cet/ibm865.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm865[] = 
 {
-	"IBM865/CR-LF", "865/CR-LF", "CP865/CR-LF", NULL
+	"IBM865", "865", "CP865", NULL
 };
 
 #define cet_ucs4_ofs_ibm865 128
diff --git a/cet/ibm868.h b/cet/ibm868.h
index 5d9ac2728..1c278ef62 100644
--- a/cet/ibm868.h
+++ b/cet/ibm868.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm868[] = 
 {
-	"IBM868/CR-LF", "868/CR-LF", "CP868/CR-LF", "cp-ar",
+	"IBM868", "868", "CP868", "cp-ar",
 	NULL
 };
 
diff --git a/cet/ibm869.h b/cet/ibm869.h
index fe2316021..57f2d9e0f 100644
--- a/cet/ibm869.h
+++ b/cet/ibm869.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm869[] = 
 {
-	"IBM869/CR-LF", "869/CR-LF", "CP869/CR-LF", "cp-gr",
+	"IBM869", "869", "CP869", "cp-gr",
 	NULL
 };
 
diff --git a/cet/ibm871.h b/cet/ibm871.h
index 5edc574ac..1fddaca3b 100644
--- a/cet/ibm871.h
+++ b/cet/ibm871.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm871[] = 
 {
-	"IBM871/CR-LF", "871/CR-LF", "CP871/CR-LF", "ebcdic-cp-is",
+	"IBM871", "871", "CP871", "ebcdic-cp-is",
 	NULL
 };
 
diff --git a/cet/ibm891.h b/cet/ibm891.h
index 863eb4ee5..2d0f3a6ab 100644
--- a/cet/ibm891.h
+++ b/cet/ibm891.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm891[] = 
 {
-	"IBM891/CR-LF", "891/CR-LF", "CP891/CR-LF", NULL
+	"IBM891", "891", "CP891", NULL
 };
 
 #define cet_ucs4_ofs_ibm891 128
diff --git a/cet/ibm903.h b/cet/ibm903.h
index 9faf79341..b9a4d6c19 100644
--- a/cet/ibm903.h
+++ b/cet/ibm903.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm903[] = 
 {
-	"IBM903/CR-LF", "903/CR-LF", "CP903/CR-LF", NULL
+	"IBM903", "903", "CP903", NULL
 };
 
 #define cet_ucs4_ofs_ibm903 128
diff --git a/cet/ibm904.h b/cet/ibm904.h
index fdd5207bf..78f489c8b 100644
--- a/cet/ibm904.h
+++ b/cet/ibm904.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm904[] = 
 {
-	"IBM904/CR-LF", "904/CR-LF", "CP904/CR-LF", NULL
+	"IBM904", "904", "CP904", NULL
 };
 
 #define cet_ucs4_ofs_ibm904 128
diff --git a/cet/iso_8859_1.h b/cet/iso_8859_1.h
index 0e6062557..8dab41ff0 100644
--- a/cet/iso_8859_1.h
+++ b/cet/iso_8859_1.h
@@ -28,8 +28,8 @@
 
 const char *cet_cs_alias_iso_8859_1[] = 
 {
-	"ISO-8859-1", "819/CR-LF", "CP819/CR-LF", "csISOLatin1", 
-	"IBM819/CR-LF", "ISO8859-1", "iso-ir-100", "ISO_8859-1", 
+	"ISO-8859-1", "819", "CP819", "csISOLatin1", 
+	"IBM819", "ISO8859-1", "iso-ir-100", "ISO_8859-1", 
 	"ISO_8859-1:1987", "l1", "lat1", "latin1", 
 	"Latin-1", NULL
 };
diff --git a/cet/iso_8859_10.h b/cet/iso_8859_10.h
index cd4ac507b..8adfc7132 100644
--- a/cet/iso_8859_10.h
+++ b/cet/iso_8859_10.h
@@ -29,8 +29,8 @@
 const char *cet_cs_alias_iso_8859_10[] = 
 {
 	"ISO-8859-10", "csISOLatin6", "ISO8859-10", "iso-ir-157", 
-	"ISO_8859-10", "ISO_8859-10:1992", "ISO_8859-10:1993", "L6", 
-	"latin6", NULL
+	"ISO_8859-10", "ISO_8859-10:1992", "ISO_8859-10:1993", 
+	"l6", "lat6", "latin6", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_10 161
diff --git a/cet/iso_8859_13.h b/cet/iso_8859_13.h
index f4997967d..e67175e09 100644
--- a/cet/iso_8859_13.h
+++ b/cet/iso_8859_13.h
@@ -29,8 +29,8 @@
 const char *cet_cs_alias_iso_8859_13[] = 
 {
 	"ISO-8859-13", "ISO8859-13", "iso-baltic", "ISO-IR-179", 
-	"iso-ir-179a", "ISO_8859-13", "ISO_8859-13:1998", "l7", 
-	"latin7", NULL
+	"iso-ir-179a", "ISO_8859-13", "ISO_8859-13:1998", 
+	"l7", "lat7", "latin7", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_13 165
diff --git a/cet/iso_8859_14.h b/cet/iso_8859_14.h
index da7a3a9aa..fb47dd817 100644
--- a/cet/iso_8859_14.h
+++ b/cet/iso_8859_14.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_14[] = 
 {
 	"ISO-8859-14", "ISO8859-14", "iso-celtic", "iso-ir-199", 
-	"ISO_8859-14", "ISO_8859-14:1998", "l8", "latin8",
+	"ISO_8859-14", "ISO_8859-14:1998", "l8", "lat8", "latin8",
 	NULL
 };
 
diff --git a/cet/iso_8859_15.h b/cet/iso_8859_15.h
index 315fb3217..88750962b 100644
--- a/cet/iso_8859_15.h
+++ b/cet/iso_8859_15.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_15[] = 
 {
 	"ISO-8859-15", "ISO8859-15", "iso-ir-203", "ISO_8859-15", 
-	"ISO_8859-15:1998", "l9", "latin9", NULL
+	"ISO_8859-15:1998", "l9", "lat9", "latin9", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_15 164
diff --git a/cet/iso_8859_2.h b/cet/iso_8859_2.h
index bf2af29e6..6e348cc06 100644
--- a/cet/iso_8859_2.h
+++ b/cet/iso_8859_2.h
@@ -28,9 +28,9 @@
 
 const char *cet_cs_alias_iso_8859_2[] = 
 {
-	"ISO-8859-2", "912/CR-LF", "CP912/CR-LF", "csISOLatin2", 
-	"IBM912/CR-LF", "ISO8859-2", "iso-ir-101", "ISO_8859-2", 
-	"ISO_8859-2:1987", "l2", "latin2", NULL
+	"ISO-8859-2", "912", "CP912", "csISOLatin2", 
+	"IBM912", "ISO8859-2", "iso-ir-101", "ISO_8859-2", 
+	"ISO_8859-2:1987", "l2", "lat2", "latin2", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_2 161
diff --git a/cet/iso_8859_3.h b/cet/iso_8859_3.h
index 8bc5e944e..1a264d196 100644
--- a/cet/iso_8859_3.h
+++ b/cet/iso_8859_3.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_3[] = 
 {
 	"ISO-8859-3", "csISOLatin3", "ISO8859-3", "iso-ir-109", 
-	"ISO_8859-3", "ISO_8859-3:1988", "l3", "latin3",
+	"ISO_8859-3", "ISO_8859-3:1988", "l3", "lat3", "latin3",
 	NULL
 };
 
diff --git a/cet/iso_8859_4.h b/cet/iso_8859_4.h
index 962852968..e9d8a6e04 100644
--- a/cet/iso_8859_4.h
+++ b/cet/iso_8859_4.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_4[] = 
 {
 	"ISO-8859-4", "csISOLatin4", "ISO8859-4", "iso-ir-110", 
-	"ISO_8859-4", "ISO_8859-4:1988", "l4", "latin4",
+	"ISO_8859-4", "ISO_8859-4:1988", "l4", "lat4", "latin4",
 	NULL
 };
 
diff --git a/cet/iso_8859_9.h b/cet/iso_8859_9.h
index 0fc4c21b1..4babb270b 100644
--- a/cet/iso_8859_9.h
+++ b/cet/iso_8859_9.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_9[] = 
 {
 	"ISO-8859-9", "csISOLatin5", "ISO8859-9", "iso-ir-148", 
-	"ISO_8859-9", "ISO_8859-9:1989", "l5", "latin5",
+	"ISO_8859-9", "ISO_8859-9:1989", "l5", "lat5", "latin5",
 	NULL
 };
 
diff --git a/cet/macintosh.h b/cet/macintosh.h
index f0cafc5a2..f4f29735f 100644
--- a/cet/macintosh.h
+++ b/cet/macintosh.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_macintosh[] = 
 {
-	"macintosh/CR", "csMacintosh", "mac/CR", "MacRoman",
+	"macintosh", "csMacintosh", "mac", "MacRoman",
 	NULL
 };
 
diff --git a/cet/macintosh_ce.h b/cet/macintosh_ce.h
index 1531f9d53..4507de637 100644
--- a/cet/macintosh_ce.h
+++ b/cet/macintosh_ce.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_macintosh_ce[] = 
 {
-	"macintosh_ce/CR", "macce/CR", NULL
+	"macintosh_ce", "macce", NULL
 };
 
 #define cet_ucs4_ofs_macintosh_ce 128
-- 
2.30.2